From: Daniel Boles <dboles@src.gnome.org>
Date: Mon, 2 Oct 2017 06:53:44 +0000 (+0100)
Subject: Revert "widget-factory: Usefully demo Frame shadow types"
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~146
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=93fc2a8edd85ade8eed004e366d5842acfc2b26d;p=gtk%2B3.0.git

Revert "widget-factory: Usefully demo Frame shadow types"

This reverts commit 15a3747406b7762518a5e573099786befb7b599d.

There is a way to get different kinds of borders: it's CSS. It's better
to keep the 4 Frames and demo the different styles we can do using CSS.
---

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 49afd094ec..5fcf9b5343 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1305,7 +1305,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child type="label">
                               <object class="GtkLabel" id="label1">
                                 <property name="visible">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Shadow&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;In&lt;/b&gt;</property>
                                 <property name="use_markup">1</property>
                               </object>
                             </child>
@@ -1317,11 +1317,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <child>
                           <object class="GtkFrame" id="frame2">
                             <property name="visible">1</property>
-                            <property name="shadow_type">none</property>
+                            <property name="shadow_type">out</property>
                             <child type="label">
                               <object class="GtkLabel" id="label2">
                                 <property name="visible">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;No shadow&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Out&lt;/b&gt;</property>
                                 <property name="use_markup">1</property>
                               </object>
                             </child>
@@ -1331,6 +1331,39 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkFrame" id="frame3">
+                            <property name="visible">1</property>
+                            <child type="label">
+                              <object class="GtkLabel" id="label17">
+                                <property name="visible">1</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Etched in&lt;/b&gt;</property>
+                                <property name="use_markup">1</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">1</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame" id="frame4">
+                            <property name="visible">1</property>
+                            <property name="shadow_type">etched-out</property>
+                            <child type="label">
+                              <object class="GtkLabel" id="label18">
+                                <property name="visible">1</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Etched out&lt;/b&gt;</property>
+                                <property name="use_markup">1</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">1</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">1</property>